Revert d171ac1..bea47f5

This rolls back to commit d171ac17cef06b190fabdfbb468793b49103e4c6.