Revert 8e92e29..f18acd2

This rolls back to commit 8e92e2910b348052a0b4c721455bf4ea3266b38d.