Revert 2621d7d..4aac60c

This rolls back to commit 2621d7d29103f1b0360a7aaa9b65382ff975386b.