Revert 15c8df6..2c552a1

This rolls back to commit 15c8df657735c1094c6478ddd379a458668042b9.