Revert 87bb9dd..1c97d0c

This rolls back to commit 87bb9dd2b7460d28798fef01529d9d0a26eab69d.