Revert 03c8f4f..936a34b

This rolls back to commit 03c8f4fa8a41c11702ce10ce79c2a591f297c63e.