Revert 60efe70..a1805e3

This rolls back to commit 60efe7038e61b10ed3ab61871624bf62716b5c7c.