Revert 8f87c55..e82eb7e

This rolls back to commit 8f87c55efe56df2b3ad1866cb9fdf5b18533ba7c.