Revert 9cc641a..1f8562a

This rolls back to commit 9cc641a2ec087810be21c984a1badd1bf99e13fe.