Revert 8ef6a9d..8f46412

This rolls back to commit 8ef6a9d425699542554c95d145babcb93c18bab9.