This reverts commit 62b03fd7e6. Effectively reverts its follow-up commits: dc218b6d4d 405d8c3865 44840fe813
62b03fd7e6
dc218b6d4d
405d8c3865
44840fe813