Revert 199cf69..002d77e

This rolls back to commit 199cf6943d7c2e34d3b547be66c5e6135975d782.