Revert 9b19e99..abdc121

This rolls back to commit 9b19e9966c60da8e52093a7fb4f0decc99fa5402.