Revert 53edc8f..9d17bd4

This rolls back to commit 53edc8f2cc76c1a833e6b0e68859cf850d27d899.