Revert f4dc4f9..2692f6d

This rolls back to commit f4dc4f9a477d8b86118ff4705da41b13eb81e0b1.