Revert 4ff685f..8e18e72

This rolls back to commit 4ff685ff2434c9e65a939def485cb41186ca3c47.