Revert f153f9a..4b5232e

This rolls back to commit f153f9a25440c851661bda6bbbeb2341872e62f6.