Revert 0e1990b..24c7a47

This rolls back to commit 0e1990b16563c778797dae2af04ce8f66ad3aa54.