Revert 0bd03e4..4190c2b

This rolls back to commit 0bd03e466f1b3473237d457a85ca162010e37c76.