Revert 506a291..bc6bfe1

This rolls back to commit 506a291b5fcc6d090d43383d82db21b4d4ca1661.