Revert 515399f..6d8662e

This rolls back to commit 515399f8178f18391161384a9f8c5905e13e0c6d.