Revert 3d40926..3f6563f

This rolls back to commit 3d409260be6a68c1adda2e5d20acd6f591e5812e.
Revert 3f6563f..f261cfb

This rolls back to commit 3f6563fa0bf26db42c747d9144e78397e059c946.