Revert 97d36b0..7cbed60

This rolls back to commit 97d36b0a8a0e23dbba06d412fd0c22263884aa0e.