This reverts commit 7e6b75004026f24cc340bc5da806fbe8fc20e6c8 and its never siblings. Retaining them in git history though.