Revert 5b3167f..1d40407

This rolls back to commit 5b3167f2567956ba3a955e57a5cc769e1795c9ae.