Revert 044a0cf..a1813cd

This rolls back to commit 044a0cf9f075149886dbcc2a50946f7e86d33ff8.