Revert 4b8e562..f7db814

This rolls back to commit 4b8e56241d35e1276b01353d29d848a4b6eb51d9.